Fixed potential crash