Framework repair (15/16)

Framework repair