validation issues fix