bugfix (again; i should stop committing until i test)