bugfix in wala
Merge branch 'wala-fix' into release-master