Hendy Irawan, I'm going to go ahead and apply my PR. Feel free to open a specific issue regarding the index creation problem if you can provide a test case.