remove need more robust nil handling