fixed angular issues