Fixing refactoring issue