CON-1598 | Fix