I think so, too.
Another (minor) reason to play ranked rounds (and finish) opposite to practice and quitting...
Edit: WGT doesn't count correctly there, omits one penalty stroke:
After 4 water shots the score is 8 (4x stroke + distance). Hitting the water again with shot #9 brings up "max shots exceeded" and the scorecard shows 9 instead of 10 :(