Fix for Issue 107 

Fix for Issue #107