fixed the setters/getters