Fix  Issue #9

Fix for  Issue #9