reintroducing one of John's changes