Fixing errors in deferred date retrieval