Fixed ticket #65