WFA-issue-14-re-size