Attempt to fix ID bug