Code Tweak for 3.7.0