Fix bug around getter and setter methods