Fix after 20 crash.