Add extra check in case we modify a flow