FIX A REGRESSION AND A DOUBLED DEFINITION