Additional "clone" for #161