Fixes Ticket #9