Fix.

Working perfectly (except for FindMathematica) on Windows.