Fix returned autorun problem