BUGFIX: closes issue #48