move patch #160 in #110