Fixed bug with sender control flow