Fixed for new node versions