Switch to a safer refactoring option