Fixed ticket #133