small fix: use direct data layer access