Attempted theoretical fix - didn't work

While this fix didn't work, it does look as though it implements
good/better practice, so this will stay here.
Temporary workaround - this issue has gone on for months now