WIP: Ugly fix for issue when importing entities