Resolved issue with duplicate site ID