bugfix #231