Tip patch

please read carefully and merge it.