Updated patch again after the lastest PR