(note that this was an issue even before this PR)