Max Zuo

@philtabor I'd appreciate it if you get a chance to take a look, it's a pretty small PR but the bump in performance is quite noticeable. Thanks.

This seems to be resolved in some of the latest nightly builds. @IRDonch can you give it a look?