Apologies, I think I made a mistake in my previous patch set. I've
attached a new suggested addition.