Fix a major regression introduced by 4396d601d61effe987
Did this patch was tested ?!