Fix RFC ignoring servers