fixed getters and setters to work correctly