fixed validation problems