Attempt to address @AlbionsRefuge's bug