making it work for newer node