CON-1536 | Fix