We seem to lose this default in the refactor?