Adapt to make it work with [#1347]