Space -> Tab fix - Second try