Fixed ticket #114