reverted whichWay to old (v3.0) version. everything seems to work
nothing major
Merge branch 'revertWhichWay'
reverted to old whichWay