Fixing #46

Fixing Issue #46