- modified to work with validator 3.1.0