This has been a longstanding issue and I thought it would be hard to do, but turns out it is pretty easy! Fixes #774