bugfix reverse flow