Fix bug with refactoring with upercase
Fix bug with refactoring with upercase