fix clone/claim bug