bug fix in zas + work on wpm