Boot repair (6/26)

Boot repair