Entity class resolving fix #2