Fix for bootstrap failure