#41 Bugfix