Roll back to 3.1 version to fix bug