BUG-582: Optimize string modification