better solution for bug #533234 courtesy of Tim.

Michael: use this version as the bugfix candidate...