Correction from #8. Please review it.