minor changes in Ticket 1175