Bugfix: macros were messing with getter and setters in some cases