Fixed ticket 37, 38, 43, 63, 64