I’m not sure if this will work in all cases. I’m going to have to move it to 5.3.13, and look into it further.