Working a bit more OS X compatible