Upgrade to 2-2

Fix for #4