WEP Fix? forked from ivendor JB Branch needs testing