fixed validation, fixed pipeline fork