Another attempted fix, in the same lines as the last commit