Fixed issue with refactoring tool