Harry: fixed merge issue