Fixed for Linux after Windows changes