this fixes bug 6081