First version of wifi fix