Fixed ticket #142