Framework repair (9/16)

Framework repair