fix the bugs found in testing forever start feature