Fixes string parsing