Fixed ticket 50