fixed with master validation