Correct implementation for previous commit.
Authored by: brunoherbelin 2017-01-13
Parent: [r1317]
Child: [r1319]