Fix for ticket #1