Follow up to 8afa3d0