More fix validation