mattdrayer/master: Fixed validation bug