Fixed bug 2699, +C and formatting.