Id clash bug fixed.