It should be fixed for existing saves, and prevented in new ones.

There is no ETA on the next patch. There are still a couple things that need to be fixed or changed.