Validitation fix