Fix 1.6.4 crash.