fix merge of me & michal rf speed hacks