Changed around something so no more crashes hopefully