Fix not loading right

To fanatic cleanup