Fix scan methods