Re #7159 Fix issue with data already loaded