Refactor #4365: Fix bug