Fixed ticket #3