Follow up to 8dd3bbf