Fixed issue #153

It turned out to me a larger issue. Had to refactor some come in the
w2form.