full fix try 1