fix Issue #33 in Mac and Unix