fixed getters and setters