fix for loading issue