fixup! control can be null