[Bugfix] closes issue #3