bugfix validate