Sun & Moon's longer sword isn't properly placed when sheathed inside the scabbard, causing clipping

[NightmareT12]

As title says, Sun & Moon released without issues, but after a hotfix the longer sword is clipping through the scabbard. It seems the longer sword is being sheathed much closer to the scabbard's entry point than it should be, which can be easily compared to the correctly sitting Dax Nikana skin, which causes the present issue.

On Sun & Moon (wrong):

On Dax Nikana (correct):

A fix would be appreciated. Thanks for your time! :)