Another refactoring failure. Thank you.