Fixed ticket 34 and 35