Fixed the ordering bug :)