Fixed the order of things (dumb ass...)