Boot repair (7/26)

Boot repair