Detect the roster location better