Fix Initial unit unlock bug