Though also index is broken :P

Signed-off-by: emanuele <emanuele45@gmail.com>
Merge pull request #338 from emanuele45/master

Innocent!