upc_2 and 3 also check

Signed-off-by: bovitobo <bovitobo@yahoo.com>