Really fixed the bug