Close Bug #201: Fix comments