Use pre-clone instead of post-clone