Remove needless check
Merge branch 'hotfix/4599'

Close #4599
Merge pull request #4602 from danizord/hotfix/remove-check

Remove needless check
Merge branch 'hotfix/4602' into develop

Forward port #4602