Fix wait for ready before tracking