improvement: optimize previous patch 73976c18e3c27b4e32c093a4c3f3e71d0193186b