Fix to W800RF plugin