bug fix & to &&