backport lp:1392390 fix to 1.21
Merge pull request #1170 from wwitzel3/ww3-lp-1392390-1.21

backport lp:1392390 fix to 1.21



(Review request: http://reviews.vapour.ws/r/481/)