slight modifications to validation
quick fix