bugfix, issue 21