Real index fix this time I swear.
Fix merge conflicts.
Merge pull request #1849 from ComicIronic/Craftlathe

Real index fix.