Tested on 3.8.3 and 3.8.4

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