Fixed refactoring lost in commit