Different version of OSX segfault fix (nw)