Mitre limit fix from maint-1.3