Fixes: #1209 (again) & #1210
Signed-off-by:KProvance <kevin.provance@gmail.com>