I was also facing the same issue with webform version 7.x-3.20 . Dan's soluti...