Resolve bug #7