fixing loading issue