bugfix #236