BUGFIX resolves issue #9