Non Window build

I only just ref old build fix.
Merge pull request #1573 from sum2012/patch-1

Non Window build fix