Implement czchen-10154
Fix typo
Don't calculate unnecessary items