Make `undefined` and `null` work with lastest release