Fix issue #9770 and #9759