BAC-1004: additional fixes - reverse check logic