My old suggestion was to combine those two condition into one, so please remove above dup condition. Sorry for confusion.