Fixed handling of weighted index data