Solved by commit revision #35