Wrong ID bug fixed