fixed baserunner logic