Double ID bug fix