Fix,  Issue #3

Fix for  Issue #3