gh-24 fix?

This works but I'm not sure it's a good idea...