Fix comments mapper