Re-fix another crash