Temp fix for loading