CON-2128 | Fix overlapping