We need to include 5.18 code in OSX builds!