Move semantics fixed