Bugfix (#44)