Shouldn't this be handled by the form?