gustafn
committed
on 17 Jun 19
make object adressing more consistent