Fix return should be dynamic