Fixup for previous bugfix (will get squashed)