Workaround bug #5770