Fixed ticket 70