really fixed the bug this time