accessor fix 2

continuation of the first accessor fix.