Fixed getters / setters