Partial fix to the -i option (still missing them links)