Solved ticket #236