Optimize changes from PR #2290
1 file changed