Fix data get and set