The problem came from my misreading of the API
This commit also fix potential misunderstanding by simplifying it further