Really fixed the bug now