fix validation?