Preflight and postflight fix