bugfix #240