Fixes. Still broke though
Possible fix
Another possible fix