Preserve nil values; resolves #4