Merge pull request #793 from galderz/t_double_validation_792