This should fix most existing entity import problems.