Fix for Issue #134

Fix for Issue #134