Fix for Issue 16

Please review the fix.