* Fixing compile issue in Mac/Windows.