Bugfix for untested code