Fixes #49

Fixes #49