Fix index (Working includes)