change proposed by @nremond on 78015979da40a48a70f7de9169fdbfe8bb6d3fb4