Bug fix, potential macro conflicts under windows,