Fix check for undef according to new instance vars