Bugfix. See #5