Framework Build Fix