v3.1 fixed