Second try to make the project compatible to OS X