So it appears that the previous fix broke things, reverting and applying in an alternative way