Fix for incorrect calculations
Merge pull request #4917 from lwyszomi/wv_indicators

Fix for incorrect calculations