I've had a package on mentors to fix this for some time, although i don't use the package enough to be sole maintainer. Is there any chance you could upload it?