Fix double scanning regression caused by a merge