BUGFIX: fixes #8