Quick fix for 2 underscore functions I missed last time