* Crash fix for the last patch.