Improve compatibility with OSX :)