Fix stage duplication