commented out two additional lines for Linux support