fix validation stuff