#63 Validation small bug fixing