CON-1446 | Fix