Fix Substitute for new hit system