CON-2040 | Fix logic