Bug Fix. Wouldn't grab an ID unless there was one there already.