bugfix #13