Does freezing here actually fix this issue? I'd have thought the relevant second passes before execution even gets here.