Bug follow refactoring