[ku6] Improve (#3015)