Fixed ticket #25