Fixed ticket #56