#640 - fix default validators