selective based spn/operatorCheck (2/2)

credit to invisiblek

Change-Id: Iffc338c0cd5db472799f7a81bd9222562e5dfef5