Probably not ideal but makes things work on OSX for me