bugfix #154