Save consistency with flare-engine 1.0 code