CON-1872 | Fix