Fix for Issue #136

Fix for Issue #136