one more change to check for Id