Fixed issue #12

Fixes Issue #12