Refactoring bug…