Another try to fix the 5.4 crash bugs.