Ticket #68, #69 and changes in #65