Fix: warning when you rename fields !!!!