Fix multiple steps