Nodevars fix