Try to fix entity problem on import softwares