Using Pathname here results in a bug in the actual call
Merge branch 'fix-editor_call'