potential crash fixed