Fixed ticket #44