fixed loading issue and export