fix for flow collisions

Change-Id: I07623fa06a5dbc1f36da021261f494f968fdf2f9
3 files changed