Bad counter value for figures when activating both figure and heading numbering

To reproduce:

• Install "Numbered Figures App" and "Numbered Headings App" extensions
• Create a page with the following content

  (% class="marvin-figure-placement" %)(((
  (% class="marvin-figure-frame" %)(((
  {{figure type="figure"}}
  {{figureCaption}}{{id name="F1"/}}Beautiful Image{{/figureCaption}}
  
  XXX
  {{/figure}}
  )))
  )))
  
  (% class="marvin-figure-placement" %)(((
  (% class="marvin-figure-frame" %)(((
  {{figure type="figure"}}
  {{figureCaption}}{{id name="F2"/}}Even More Beautiful Image{{/figureCaption}}
  
  YYY
  {{/figure}}
  )))
  ))) 
  

• Activate figure numbering (by adding an xobject of type NumberedFigures.Code.NumberedFiguresClass. Notice that the figures are correctly numbered 1 and 2:
• Activate heading numbering (by using the Information extra tab). Notice that the figures are now incorrectly numbered 1 and 1: