Might have fixed the bug