Fixed for string optimizations