Fixed the other cross machine problem with remainder check