Fix the framework issue