Fix for less crashies on Node