Hopefully fixed errors when falling back to gnode