I had the same issue with my 16. Solution was to drill out the rivets on the petcock, replace the o-ring and then use bolts to redo it all together again. You maybe able to find a new petcock, but its not easy.

cheers,