added Non_Zero poly handling
fixed NZ bug for oa ~= ob