fix flow for a new machine