FIX; bug in FIRST set comoutation