Fix issue with unloaded dataset