bugfix wrong flow