Ticket 2 fixes #2