Bug fix #454. I also removed the fields X, Y, Width, Height and Hidden from the model comparison