yipee! Finally put in the patch from Alexey Kotovich