A partial fix was already included in the initial patch in #1746, but it was only applied to a subset of titles.