solved bug #7