Fixes base access bug
Revert to old macro based getter setter