Issue #8756 by tuj: Fixed unique ids