org-mode tags are not right-aligned with proportional fonts

I see that modus-themes uses variable pitch headings in org-mode, e.g.:

`(org-level-1 ((,class :inherit (bold ,modus-theme-variable-pitch)

The problem with this is that if tags are used, it breaks the alignment with the right-hand margin:

Do you know if there is any way to fix the alignment while keeping variable pitch? If not I guess the only answer is to disable it, which would be a shame as I think it looks really cool otherwise ;-)