scaffold and validator fix