fix for Ticket #25