Best practice for celestial fix