Make event sharing more robust - Helps Fix #142