Re #7699 Fix issue with loaded data
(cherry picked from commit acfe2643fd93be2c94bc15432f5ca715c0353709)