Fix data extending when data is string