Fixed refactoring error...