Framework repair (14/16)

Framework repair