fixed issue with validator