changes suggested by upstream