Fixed ticket 1234