fixed issues related to validation