Fix score computation