#1392, #1387 - thanks @rrikesh
Signed-off-by:KProvance <kevin.provance@gmail.com>