Correct refactoring mess (Thanks Brux)