bugfix #233