Fix exchange of Id to buffer, but backwards conceptually.