Fixed ticket 51