Update framework (fix 3)