#53 Fix index