Fix for ticket 27