Made it workable on Unix