More possible OSX compatibility