Fixes #12

Fixes #12