Implements #884
Fix type (booTstrap) on #885