Bug fix for Unix-like environment