fixing entities