Fixed ticket #1 :)