Added missing return
Merge branch 'hotfix/3611'

Close #3611