fix get and put