Fix for Issue #26

Fix for Issue #26