fix after validate