removed bug fix. caused other issues