fix #862
fix #857
Once deployed, simply destroy the private/AdvancementLimit to enable the new behaviour