Fix for #1728. Continued fixing indentation.