Really fixed the bug this time (?)