Fixed horrible crash!