diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69de29bb..6bacbe4c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,2 @@
+Fix bug where 1st gen functions eventually fail with stack too deep (#1540)
+Make simple CORS options static for improved debugability (#1536)
diff --git a/src/v1/cloud-functions.ts b/src/v1/cloud-functions.ts
index d5bd3d015..75921ab6f 100644
--- a/src/v1/cloud-functions.ts
+++ b/src/v1/cloud-functions.ts
@@ -367,6 +367,7 @@ export function makeCloudFunction<EventData>({
   service,
   triggerResource,
 }: MakeCloudFunctionArgs<EventData>): CloudFunction<EventData> {
+  handler = withInit(handler);
   const cloudFunction: any = (data: any, context: any) => {
     if (legacyEventType && context.eventType === legacyEventType) {
       /*
@@ -404,7 +405,6 @@ export function makeCloudFunction<EventData>({
       context.params = context.params || _makeParams(context, triggerResource);
     }
 
-    handler = withInit(handler);
     let promise;
     if (labels && labels["deployment-scheduled"]) {
       // Scheduled function do not have meaningful data, so exclude it