bugfix #269