Fixed ticket 39