Fix around callback ordering