Little changes to recover crash.