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