Issue #49, bugfix
issue #53