getter/setters corrections