Fix for Issue #12

Fix for Issue #12