Fix comments property existing twice