Fix for missing entities