Ticket 1289 resolved