Fixed almost ruining everything