Refactoring sometimes creates issues