Try to fix & bug