2946 fixup