Windows and MATLAB detection revisited