Fixing loading issue