Fix Issue #12

Fixes #12