Fix for ticket 121