Framework repair (16/16)

Framework repair