Fixed ticket 6