may need some more discussion, but not the point for this branch anyway,
and at least it's more consistent with rest of the source code.