CON-1707 | Fix