Fixed checkFinal