Bugfix that accidentally got lost in the merge.