Fixed #13909 issue

@senny