Bug and Indentation fix