Framework repair (3/16)

Framework repair