Fixed up potential crash