I guess that might be a necessary stopgap for now, but I'm confused why this would be working differently in vanilla and JJ2+, it doesn't seem like there's an obvious reason that would need to broken right now...