added correct RFAdress handling