Hopfully improve on issue in #1403

Should run a little quicker, added some ().