apply bugfix ac8e38e to low-energy models as well