Fix scan finishing