Hopefully fixed the bug