Fixed incorrect deferred ID handling.