Fix the Dynamic return issue