Frameworks fixed