fix & compeletting