[base] Maybe improved and tested.