Added (non)support for undefined