Refactor Bug