Take @ahocevar's comments into account