fixed validation probably