Fix definition ordering