Fix shit part 1