Fixed cloning of the generic methods. Fixes losing optimization on generic methods