Fix bug #7077

Cancel this request please.