Make event sharing more robust - Helps Fix #142
Fix indent
Fix indent, please