fixed undef cases in v.06