Fix double loading for datasets