Fix for bootleaf code