BUGFIX: Fixes #15