Quick hack until getter/setter issue is fixed.