Yet another crash fixed