bugfix #28