Fix: #1244 & #1245
Signed-off-by:KProvance <kevin.provance@gmail.com>