Fix getters & setters behaviour