Fix callback order for findById