Bugfix (#29)