Applying the fix in order to attempt prevent losing strings. This still
needs to be tested.