bugfix #17