Fixing bug: all instances of WrappedNil should be nil