Fixed & bug