That's seems correct:

Weighted Average = sum (Xi*Wi)/Sum(Wi)

Xi the values
Wi the weight