Upgrade to collection 2.*