this is a fix, right? perhaps better in its own PR?