add hit restriction at load time, fix end run bug