FIxed intent logic mixup
(cherry picked from commit c726d4a)