horrible validation bug fixed