Nasty commit for CheckIndex