fixes for ticketno.204