Add fix for loading