fixed double intent handling