Another try to fix index