Fixed regex replace