Added clone method to resolve bug