[BUG #7631] improved workaround