Fixed Entity Editor