Fixing the ordering issue