Comments fix for #314