Add fix for crasher.