fix to latest wala master