Finally fixed an issue that's been bugging me.

At least, it's fixed itself on OpenSUSE. We'll see if it stays resolved
on OS X.