Initial scan fixed - working