Fixing entities 666