Hopefully fixed the bug this time