re full fix try 2