Fixed the ordering issue