Fix to validation