v3.1 some fixed