Fix scan method