Fix issue with overlaping string pointers
EUCA-6166