Fix for #181 on WAI 2.0 branch