bugfix #27