potential crash fixed.