fixing move and copy