Trying to fix the clone problem