fixes for ticket 773