fix for deferred loading problem