Fix string transformation to keep BC