Fixes #46

Fixes the issue outlined in #46