CON-522 | Fix