Fix to initalizing order