move to latest waf (still doesn't work though)