Fixing #4322

* There's probably a much more "modular" way of doing this, but, eh