Solve by commit revision #36