Fixed validation - wasn't working properly.