Fixing entities issue