Fixed ticket 41