Another attempt at fixing the problem. Didn't work