Add special handling for undefined