fixed getter/setters