more suggestions to 3.1 fixed