Crash compatibility

Summary