Merge "Fixed an error in invokechanger"