Attempts to further fix indentation processing