i have done the same (IMHO) and fixed the indentation issue as well