fix scope with tracking