Align Entities with fix