Fixed #4794 issue