Fixed ticket #128