Attempting to fix bug in undef load