Bring HS back in line with current process behaviour