potential ID bug fixed