- Fixed StackOverflow caused by the previous commit, closes #2669.