bugfix #11