DC/Melanie | #4150 | fixing basic flow