Fixed crashes (forever)

srsly nvr crsh agin