fixed get and sets