improve and fix bug in V2.6