Fixed Entity problems