Probably a backwards incompatible fix in the not-too-distant future...