Fix #9 timing attack