fixed customvalidator
fixed merge - please check