Bugfix (issue #10)