added Joel's fix for validation, he is a machine I tell you!