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