Fix for ticket #2