Separate out block comment fix