fixup! [CALL] Added proper hold/activate handling.