Fixing move semantics