isEntity fixed