Merge of logic-bomb of Aaron