Fix unnecessary computation