CON-1298 | fix order