Upgrade to Blueprints 2.4.0