Fixed ticket 65 and 66