Improper validation bug fixed