Added condition to prevent hydrating of already hydrated data