fixing cross machine compatibility