Update to latest 2.2.1