CON-1486 | Fix class