BUGFIX: fixes #784