Bugfix #47