Added fix for SourceForge issue #1