Fix test failure

The bug was introduced when I merged branch 'interpreter-api' at
5f2477d5bf1b8601246e246adada21ab6c28c268.
This patch redo (part of) 2846fe980b468ac43b1c09461a192486787664aa.