shouldn't this be `(default null)` according to previous refactor?