Bug fix for Issue #2 found by jimj