M101 - Fix event driven mission logic

@carueda, please review
@edwardhunter please merge