GPII-177: Forgot to add in Javi's linux solution changes