Upgrading to version 2.3.1