removed boolean check