Ensuring the Punishment Fits the Crime