Fixed ticket 32