fix ambiguities introduced with rvalue support