This should hopefully fix some issues for the time being, though there are some bugs with it