Fix indentation and bug #8895