patch RMF some more