+ fixed copy / move bug