Tested on 3.8.2

Signed-off-by: David Goulet <dgoulet@ev0ke.net>