fixed get and put