Fix deferred loading.