make the new clone actually work correctly and add regression test