[PLAT-3015] Fix new class