Hotfix: entities duplication fixed