fix merge issue in previous (again)