Fix / improve low-level read logic