Fix for non-const rvalue reference assignment