FIxed intent logic mixup