fixed staff issues on ts