Fix callback before transition