#1638, #1642
Signed-off-by:KProvance <kevin.provance@gmail.com>