fixed fill and reset_validation