Dont expand events - closes #666