Bugfix (#69)