CON-1809 | Fix