porting over clone fix from recent snap checkin