Fix syntax error with target_mode
Fixup on notification