Fixed ticket #20