Fixed ticket #6