Almost fix Shared scanner...