Simpler fix for handling escaped strings