Adapt to 3.4
Clarify