Fix bug for the third time
Bugfix WIP; not sure what's going on