Fix before add validation