bugfix #41