fixing after validator