Fixing an old monstrosity...