this fixes bug #8395