@yishaigalatzer seems odd to have this fallback logic here instead of in the `CreateActionResult` method