Fixed Getters and Setters