Fixed the object identifier collusion.
Fixed regression