bugfix, issue #22