gustafn
committed
on 17 Jun
make object adressing more consistent