WP fix contributed by James Goppert

This is a sane hotfix and obvious - tested, signing off, merging.